merge with xen-unstable.hg
authorHollis Blanchard <hollisb@us.ibm.com>
Mon, 7 Aug 2006 23:00:22 +0000 (18:00 -0500)
committerHollis Blanchard <hollisb@us.ibm.com>
Mon, 7 Aug 2006 23:00:22 +0000 (18:00 -0500)
1  2 
.hgignore

diff --cc .hgignore
Simple merge